diff --git a/Skills/Elo/EloRating.php b/src/Elo/EloRating.php
similarity index 100%
rename from Skills/Elo/EloRating.php
rename to src/Elo/EloRating.php
diff --git a/Skills/Elo/FideEloCalculator.php b/src/Elo/FideEloCalculator.php
similarity index 100%
rename from Skills/Elo/FideEloCalculator.php
rename to src/Elo/FideEloCalculator.php
diff --git a/Skills/Elo/FideKFactor.php b/src/Elo/FideKFactor.php
similarity index 100%
rename from Skills/Elo/FideKFactor.php
rename to src/Elo/FideKFactor.php
diff --git a/Skills/Elo/GaussianEloCalculator.php b/src/Elo/GaussianEloCalculator.php
similarity index 100%
rename from Skills/Elo/GaussianEloCalculator.php
rename to src/Elo/GaussianEloCalculator.php
diff --git a/Skills/Elo/KFactor.php b/src/Elo/KFactor.php
similarity index 100%
rename from Skills/Elo/KFactor.php
rename to src/Elo/KFactor.php
diff --git a/Skills/Elo/TwoPlayerEloCalculator.php b/src/Elo/TwoPlayerEloCalculator.php
similarity index 100%
rename from Skills/Elo/TwoPlayerEloCalculator.php
rename to src/Elo/TwoPlayerEloCalculator.php
diff --git a/Skills/FactorGraphs/Factor.php b/src/FactorGraphs/Factor.php
similarity index 100%
rename from Skills/FactorGraphs/Factor.php
rename to src/FactorGraphs/Factor.php
diff --git a/Skills/FactorGraphs/FactorGraph.php b/src/FactorGraphs/FactorGraph.php
similarity index 100%
rename from Skills/FactorGraphs/FactorGraph.php
rename to src/FactorGraphs/FactorGraph.php
diff --git a/Skills/FactorGraphs/FactorGraphLayer.php b/src/FactorGraphs/FactorGraphLayer.php
similarity index 100%
rename from Skills/FactorGraphs/FactorGraphLayer.php
rename to src/FactorGraphs/FactorGraphLayer.php
diff --git a/Skills/FactorGraphs/FactorList.php b/src/FactorGraphs/FactorList.php
similarity index 100%
rename from Skills/FactorGraphs/FactorList.php
rename to src/FactorGraphs/FactorList.php
diff --git a/Skills/FactorGraphs/Message.php b/src/FactorGraphs/Message.php
similarity index 100%
rename from Skills/FactorGraphs/Message.php
rename to src/FactorGraphs/Message.php
diff --git a/Skills/FactorGraphs/Schedule.php b/src/FactorGraphs/Schedule.php
similarity index 100%
rename from Skills/FactorGraphs/Schedule.php
rename to src/FactorGraphs/Schedule.php
diff --git a/Skills/FactorGraphs/Variable.php b/src/FactorGraphs/Variable.php
similarity index 100%
rename from Skills/FactorGraphs/Variable.php
rename to src/FactorGraphs/Variable.php
diff --git a/Skills/FactorGraphs/VariableFactory.php b/src/FactorGraphs/VariableFactory.php
similarity index 100%
rename from Skills/FactorGraphs/VariableFactory.php
rename to src/FactorGraphs/VariableFactory.php
diff --git a/Skills/GameInfo.php b/src/GameInfo.php
similarity index 100%
rename from Skills/GameInfo.php
rename to src/GameInfo.php
diff --git a/Skills/Guard.php b/src/Guard.php
similarity index 100%
rename from Skills/Guard.php
rename to src/Guard.php
diff --git a/Skills/HashMap.php b/src/HashMap.php
similarity index 100%
rename from Skills/HashMap.php
rename to src/HashMap.php
diff --git a/Skills/ISupportPartialPlay.php b/src/ISupportPartialPlay.php
similarity index 100%
rename from Skills/ISupportPartialPlay.php
rename to src/ISupportPartialPlay.php
diff --git a/Skills/ISupportPartialUpdate.php b/src/ISupportPartialUpdate.php
similarity index 100%
rename from Skills/ISupportPartialUpdate.php
rename to src/ISupportPartialUpdate.php
diff --git a/Skills/Numerics/BasicMath.php b/src/Numerics/BasicMath.php
similarity index 100%
rename from Skills/Numerics/BasicMath.php
rename to src/Numerics/BasicMath.php
diff --git a/Skills/Numerics/GaussianDistribution.php b/src/Numerics/GaussianDistribution.php
similarity index 100%
rename from Skills/Numerics/GaussianDistribution.php
rename to src/Numerics/GaussianDistribution.php
diff --git a/Skills/Numerics/Matrix.php b/src/Numerics/Matrix.php
similarity index 100%
rename from Skills/Numerics/Matrix.php
rename to src/Numerics/Matrix.php
diff --git a/Skills/Numerics/Range.php b/src/Numerics/Range.php
similarity index 100%
rename from Skills/Numerics/Range.php
rename to src/Numerics/Range.php
diff --git a/Skills/PairwiseComparison.php b/src/PairwiseComparison.php
similarity index 100%
rename from Skills/PairwiseComparison.php
rename to src/PairwiseComparison.php
diff --git a/Skills/PartialPlay.php b/src/PartialPlay.php
similarity index 100%
rename from Skills/PartialPlay.php
rename to src/PartialPlay.php
diff --git a/Skills/Player.php b/src/Player.php
similarity index 100%
rename from Skills/Player.php
rename to src/Player.php
diff --git a/Skills/PlayersRange.php b/src/PlayersRange.php
similarity index 100%
rename from Skills/PlayersRange.php
rename to src/PlayersRange.php
diff --git a/Skills/RankSorter.php b/src/RankSorter.php
similarity index 100%
rename from Skills/RankSorter.php
rename to src/RankSorter.php
diff --git a/Skills/Rating.php b/src/Rating.php
similarity index 100%
rename from Skills/Rating.php
rename to src/Rating.php
diff --git a/Skills/RatingContainer.php b/src/RatingContainer.php
similarity index 100%
rename from Skills/RatingContainer.php
rename to src/RatingContainer.php
diff --git a/Skills/SkillCalculator.php b/src/SkillCalculator.php
similarity index 100%
rename from Skills/SkillCalculator.php
rename to src/SkillCalculator.php
diff --git a/Skills/Team.php b/src/Team.php
similarity index 100%
rename from Skills/Team.php
rename to src/Team.php
diff --git a/Skills/Teams.php b/src/Teams.php
similarity index 100%
rename from Skills/Teams.php
rename to src/Teams.php
diff --git a/Skills/TeamsRange.php b/src/TeamsRange.php
similarity index 100%
rename from Skills/TeamsRange.php
rename to src/TeamsRange.php
diff --git a/Skills/TrueSkill/DrawMargin.php b/src/TrueSkill/DrawMargin.php
similarity index 100%
rename from Skills/TrueSkill/DrawMargin.php
rename to src/TrueSkill/DrawMargin.php
diff --git a/Skills/TrueSkill/FactorGraphTrueSkillCalculator.php b/src/TrueSkill/FactorGraphTrueSkillCalculator.php
similarity index 100%
rename from Skills/TrueSkill/FactorGraphTrueSkillCalculator.php
rename to src/TrueSkill/FactorGraphTrueSkillCalculator.php
diff --git a/Skills/TrueSkill/Factors/GaussianFactor.php b/src/TrueSkill/Factors/GaussianFactor.php
similarity index 100%
rename from Skills/TrueSkill/Factors/GaussianFactor.php
rename to src/TrueSkill/Factors/GaussianFactor.php
diff --git a/Skills/TrueSkill/Factors/GaussianGreaterThanFactor.php b/src/TrueSkill/Factors/GaussianGreaterThanFactor.php
similarity index 100%
rename from Skills/TrueSkill/Factors/GaussianGreaterThanFactor.php
rename to src/TrueSkill/Factors/GaussianGreaterThanFactor.php
diff --git a/Skills/TrueSkill/Factors/GaussianLikelihoodFactor.php b/src/TrueSkill/Factors/GaussianLikelihoodFactor.php
similarity index 100%
rename from Skills/TrueSkill/Factors/GaussianLikelihoodFactor.php
rename to src/TrueSkill/Factors/GaussianLikelihoodFactor.php
diff --git a/Skills/TrueSkill/Factors/GaussianPriorFactor.php b/src/TrueSkill/Factors/GaussianPriorFactor.php
similarity index 100%
rename from Skills/TrueSkill/Factors/GaussianPriorFactor.php
rename to src/TrueSkill/Factors/GaussianPriorFactor.php
diff --git a/Skills/TrueSkill/Factors/GaussianWeightedSumFactor.php b/src/TrueSkill/Factors/GaussianWeightedSumFactor.php
similarity index 100%
rename from Skills/TrueSkill/Factors/GaussianWeightedSumFactor.php
rename to src/TrueSkill/Factors/GaussianWeightedSumFactor.php
diff --git a/Skills/TrueSkill/Factors/GaussianWithinFactor.php b/src/TrueSkill/Factors/GaussianWithinFactor.php
similarity index 100%
rename from Skills/TrueSkill/Factors/GaussianWithinFactor.php
rename to src/TrueSkill/Factors/GaussianWithinFactor.php
diff --git a/Skills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php b/src/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
similarity index 100%
rename from Skills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
rename to src/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
diff --git a/Skills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php b/src/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
similarity index 100%
rename from Skills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
rename to src/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
diff --git a/Skills/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php b/src/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php
similarity index 100%
rename from Skills/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php
rename to src/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php
diff --git a/Skills/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php b/src/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php
similarity index 100%
rename from Skills/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php
rename to src/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php
diff --git a/Skills/TrueSkill/Layers/TeamDifferencesComparisonLayer.php b/src/TrueSkill/Layers/TeamDifferencesComparisonLayer.php
similarity index 100%
rename from Skills/TrueSkill/Layers/TeamDifferencesComparisonLayer.php
rename to src/TrueSkill/Layers/TeamDifferencesComparisonLayer.php
diff --git a/Skills/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php b/src/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php
similarity index 100%
rename from Skills/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php
rename to src/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php
diff --git a/Skills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php b/src/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
similarity index 100%
rename from Skills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
rename to src/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
diff --git a/Skills/TrueSkill/TrueSkillFactorGraph.php b/src/TrueSkill/TrueSkillFactorGraph.php
similarity index 100%
rename from Skills/TrueSkill/TrueSkillFactorGraph.php
rename to src/TrueSkill/TrueSkillFactorGraph.php
diff --git a/Skills/TrueSkill/TruncatedGaussianCorrectionFunctions.php b/src/TrueSkill/TruncatedGaussianCorrectionFunctions.php
similarity index 100%
rename from Skills/TrueSkill/TruncatedGaussianCorrectionFunctions.php
rename to src/TrueSkill/TruncatedGaussianCorrectionFunctions.php
diff --git a/Skills/TrueSkill/TwoPlayerTrueSkillCalculator.php b/src/TrueSkill/TwoPlayerTrueSkillCalculator.php
similarity index 100%
rename from Skills/TrueSkill/TwoPlayerTrueSkillCalculator.php
rename to src/TrueSkill/TwoPlayerTrueSkillCalculator.php
diff --git a/Skills/TrueSkill/TwoTeamTrueSkillCalculator.php b/src/TrueSkill/TwoTeamTrueSkillCalculator.php
similarity index 100%
rename from Skills/TrueSkill/TwoTeamTrueSkillCalculator.php
rename to src/TrueSkill/TwoTeamTrueSkillCalculator.php
diff --git a/UnitTests/Elo/EloAssert.php b/tests/Elo/EloAssert.php
similarity index 100%
rename from UnitTests/Elo/EloAssert.php
rename to tests/Elo/EloAssert.php
diff --git a/UnitTests/Elo/FideEloCalculatorTest.php b/tests/Elo/FideEloCalculatorTest.php
similarity index 100%
rename from UnitTests/Elo/FideEloCalculatorTest.php
rename to tests/Elo/FideEloCalculatorTest.php
diff --git a/UnitTests/Numerics/BasicMathTest.php b/tests/Numerics/BasicMathTest.php
similarity index 100%
rename from UnitTests/Numerics/BasicMathTest.php
rename to tests/Numerics/BasicMathTest.php
diff --git a/UnitTests/Numerics/GaussianDistributionTest.php b/tests/Numerics/GaussianDistributionTest.php
similarity index 100%
rename from UnitTests/Numerics/GaussianDistributionTest.php
rename to tests/Numerics/GaussianDistributionTest.php
diff --git a/UnitTests/Numerics/MatrixTest.php b/tests/Numerics/MatrixTest.php
similarity index 100%
rename from UnitTests/Numerics/MatrixTest.php
rename to tests/Numerics/MatrixTest.php
diff --git a/UnitTests/RankSorterTest.php b/tests/RankSorterTest.php
similarity index 100%
rename from UnitTests/RankSorterTest.php
rename to tests/RankSorterTest.php
diff --git a/UnitTests/TrueSkill/DrawMarginTest.php b/tests/TrueSkill/DrawMarginTest.php
similarity index 100%
rename from UnitTests/TrueSkill/DrawMarginTest.php
rename to tests/TrueSkill/DrawMarginTest.php
diff --git a/UnitTests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php b/tests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php
similarity index 100%
rename from UnitTests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php
rename to tests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php
diff --git a/UnitTests/TrueSkill/TrueSkillCalculatorTests.php b/tests/TrueSkill/TrueSkillCalculatorTests.php
similarity index 100%
rename from UnitTests/TrueSkill/TrueSkillCalculatorTests.php
rename to tests/TrueSkill/TrueSkillCalculatorTests.php
diff --git a/UnitTests/TrueSkill/TwoPlayerTrueSkillCalculatorTest.php b/tests/TrueSkill/TwoPlayerTrueSkillCalculatorTest.php
similarity index 100%
rename from UnitTests/TrueSkill/TwoPlayerTrueSkillCalculatorTest.php
rename to tests/TrueSkill/TwoPlayerTrueSkillCalculatorTest.php
diff --git a/UnitTests/TrueSkill/TwoTeamTrueSkillCalculatorTest.php b/tests/TrueSkill/TwoTeamTrueSkillCalculatorTest.php
similarity index 100%
rename from UnitTests/TrueSkill/TwoTeamTrueSkillCalculatorTest.php
rename to tests/TrueSkill/TwoTeamTrueSkillCalculatorTest.php